cssvalue: First step of proper dependency tracking

Instead of using the EVERYTHING aka FIXME value for tdependencies,
actually compute the dependencies in a bunch of simple cases.

diff --git a/gtk/gtkcssbordervalue.c b/gtk/gtkcssbordervalue.c
index 085e3f2e40efc980bc3b14963ccc6e6e2db5dd0f..dab46319ae756b4b6e0b119578eeb2fc64d1c304 100644 (file)
--- a/gtk/gtkcssbordervalue.c
+++ b/gtk/gtkcssbordervalue.c
@@ -48,11 +48,10 @@ gtk_css_value_border_compute (GtkCssValue        *value,
                               GtkCssDependencies *dependencies)
 {
   GtkCssValue *computed;
+  GtkCssDependencies child_deps;
   gboolean changed = FALSE;
   guint i;
 
-  *dependencies = GTK_CSS_DEPENDS_ON_EVERYTHING;
-
   computed = _gtk_css_border_value_new (NULL, NULL, NULL, NULL);
   computed->fill = value->fill;
 
@@ -60,7 +59,8 @@ gtk_css_value_border_compute (GtkCssValue        *value,
     {
       if (value->values[i])
         {
-          computed->values[i] = _gtk_css_value_compute (value->values[i], property_id, context, NULL);
+          computed->values[i] = _gtk_css_value_compute (value->values[i], property_id, context, &child_deps);
+          *dependencies = _gtk_css_dependencies_union (*dependencies, child_deps);
           changed |= (computed->values[i] != value->values[i]);
         }
     }

diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c
index 8710243aff3bc2fc2b794eb0410cbaf52370e7ca..d26dffd1d7164727290abcfb0a23605473e1ab02 100644 (file)
--- a/gtk/gtkcsscornervalue.c
+++ b/gtk/gtkcsscornervalue.c
@@ -43,11 +43,11 @@ gtk_css_value_corner_compute (GtkCssValue        *corner,
                               GtkCssDependencies *dependencies)
 {
   GtkCssValue *x, *y;
+  GtkCssDependencies x_deps, y_deps;
 
-  *dependencies = GTK_CSS_DEPENDS_ON_EVERYTHING;
-
-  x = _gtk_css_value_compute (corner->x, property_id, context, NULL);
-  y = _gtk_css_value_compute (corner->y, property_id, context, NULL);
+  x = _gtk_css_value_compute (corner->x, property_id, context, &x_deps);
+  y = _gtk_css_value_compute (corner->y, property_id, context, &y_deps);
+  *dependencies = _gtk_css_dependencies_union (x_deps, y_deps);
   if (x == corner->x && y == corner->y)
     {
       _gtk_css_value_unref (x);

diff --git a/gtk/gtkcssinheritvalue.c b/gtk/gtkcssinheritvalue.c
index 58964be2409f6f8f45e6748524753de67d52a0a6..d70200d038be5e29f3a7df05ea1a6e76f2e4dbd8 100644 (file)
--- a/gtk/gtkcssinheritvalue.c
+++ b/gtk/gtkcssinheritvalue.c
@@ -41,15 +41,18 @@ gtk_css_value_inherit_compute (GtkCssValue        *value,
 {
   GtkStyleContext *parent = gtk_style_context_get_parent (context);
 
-  *dependencies = GTK_CSS_DEPENDS_ON_EVERYTHING;
-
   if (parent)
-    return _gtk_css_value_ref (_gtk_style_context_peek_property (parent, property_id));
+    {
+      *dependencies = GTK_CSS_EQUALS_PARENT;
+      return _gtk_css_value_ref (_gtk_style_context_peek_property (parent, property_id));
+    }
   else
-    return _gtk_css_value_compute (_gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (property_id)),
-                                   property_id,
-                                   context,
-                                   NULL);
+    {
+      return _gtk_css_value_compute (_gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (property_id)),
+                                     property_id,
+                                     context,
+                                     dependencies);
+    }
 }
 
 static gboolean

diff --git a/gtk/gtkcssnumbervalue.c b/gtk/gtkcssnumbervalue.c
index 535c20587fa84fff2b2811252776ce5d779b135c..db9e154a77003d24818edc191301802be4ed55d0 100644 (file)
--- a/gtk/gtkcssnumbervalue.c
+++ b/gtk/gtkcssnumbervalue.c
@@ -74,8 +74,6 @@ gtk_css_value_number_compute (GtkCssValue        *number,
         break;
     }
 
-  *dependencies = GTK_CSS_DEPENDS_ON_EVERYTHING;
-
   switch (number->unit)
     {
     default:
@@ -107,12 +105,14 @@ gtk_css_value_number_compute (GtkCssValue        *number,
                                         GTK_CSS_PX);
       break;
     case GTK_CSS_EM:
+      *dependencies = GTK_CSS_DEPENDS_ON_FONT_SIZE;
       return _gtk_css_number_value_new (number->value *
                                         _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_FONT_SIZE), 100),
                                         GTK_CSS_PX);
       break;
     case GTK_CSS_EX:
       /* for now we pretend ex is half of em */
+      *dependencies = GTK_CSS_DEPENDS_ON_FONT_SIZE;
       return _gtk_css_number_value_new (number->value * 0.5 * 
                                         _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_FONT_SIZE), 100),
                                         GTK_CSS_PX);

diff --git a/gtk/gtkcsspositionvalue.c b/gtk/gtkcsspositionvalue.c
index 6a6cbe3828d380037ae6d4276736045cb838d913..e69147a995f7d5030562ff752248a1551177a4b4 100644 (file)
--- a/gtk/gtkcsspositionvalue.c
+++ b/gtk/gtkcsspositionvalue.c
@@ -43,9 +43,11 @@ gtk_css_value_position_compute (GtkCssValue        *position,
                                 GtkCssDependencies *dependencies)
 {
   GtkCssValue *x, *y;
+  GtkCssDependencies x_deps, y_deps;
 
-  x = _gtk_css_value_compute (position->x, property_id, context, NULL);
-  y = _gtk_css_value_compute (position->y, property_id, context, NULL);
+  x = _gtk_css_value_compute (position->x, property_id, context, &x_deps);
+  y = _gtk_css_value_compute (position->y, property_id, context, &y_deps);
+  *dependencies = _gtk_css_dependencies_union (x_deps, y_deps);
   if (x == position->x && y == position->y)
     {
       _gtk_css_value_unref (x);
@@ -53,8 +55,6 @@ gtk_css_value_position_compute (GtkCssValue        *position,
       return _gtk_css_value_ref (position);
     }
 
-  *dependencies = GTK_CSS_DEPENDS_ON_EVERYTHING;
-
   return _gtk_css_position_value_new (x, y);
 }
 

diff --git a/gtk/gtkcsstypes.c b/gtk/gtkcsstypes.c
index b69b0feccafb591fdb0bc30be7098400f2b2b270..e67dceac56e5f9ca6edc4a640fd2b638a597e9f6 100644 (file)
--- a/gtk/gtkcsstypes.c
+++ b/gtk/gtkcsstypes.c
@@ -82,3 +82,11 @@ _gtk_css_change_for_child (GtkCssChange match)
   return gtk_css_change_translate (match, table, G_N_ELEMENTS (table)); 
 }
 
+GtkCssDependencies
+_gtk_css_dependencies_union (GtkCssDependencies first,
+                             GtkCssDependencies second)
+{
+  return (first  & ~GTK_CSS_EQUALS_PARENT) | ((first  & GTK_CSS_EQUALS_PARENT) ? GTK_CSS_DEPENDS_ON_PARENT : 0)
+       | (second & ~GTK_CSS_EQUALS_PARENT) | ((second & GTK_CSS_EQUALS_PARENT) ? GTK_CSS_DEPENDS_ON_PARENT : 0);
+}
+

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index dfc9527e0db4f653484f54cac06192a8ffab8245..a77bd8cc709f6349e88c47fa25d87db498361c08 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -170,8 +170,10 @@ typedef enum /*< skip >*/ {
   GTK_CSS_MS,
 } GtkCssUnit;
 
-GtkCssChange    _gtk_css_change_for_sibling                      (GtkCssChange       match);
-GtkCssChange    _gtk_css_change_for_child                        (GtkCssChange       match);
+GtkCssChange            _gtk_css_change_for_sibling              (GtkCssChange       match);
+GtkCssChange            _gtk_css_change_for_child                (GtkCssChange       match);
+GtkCssDependencies      _gtk_css_dependencies_union              (GtkCssDependencies first,
+                                                                  GtkCssDependencies second);
 
 
 G_END_DECLS